merge trunk
authorKenichi Handa <handa@etlken>
Thu, 24 Jun 2010 06:10:43 +0000 (15:10 +0900)
committerKenichi Handa <handa@etlken>
Thu, 24 Jun 2010 06:10:43 +0000 (15:10 +0900)

Trivial merge